From c08b315c3263d609d4c923b81113af02129637a0 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 31 Jan 2014 16:39:33 -0500 Subject: [PATCH] gdkwindow-wayland: Erm, put the DESTROYED check in the right spot... --- gdk/wayland/gdkwindow-wayland.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index ec51f590a7..025b03ba22 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -315,6 +315,10 @@ frame_callback (void *data, GdkFrameTimings *timings; wl_callback_destroy (callback); + + if (GDK_WINDOW_DESTROYED (window)) + return; + _gdk_frame_clock_thaw (clock); timings = gdk_frame_clock_get_timings (clock, impl->pending_frame_counter); @@ -403,10 +407,6 @@ on_frame_clock_after_paint (GdkFrameClock *clock, return; impl->pending_commit = FALSE; - - if (GDK_WINDOW_DESTROYED (window)) - return; - impl->pending_frame_counter = gdk_frame_clock_get_frame_counter (clock); callback = wl_surface_frame (impl->surface); -- 2.30.2